Sun Dec 11 11:59:06 2011 UTC ()
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.


(marino)
diff -r1.9 -r1.10 pkgsrc/graphics/osg/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/graphics/osg/PLIST
diff -r1.2 -r1.3 pkgsrc/graphics/osg/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/graphics/osg/patches/patch-ab
diff -r0 -r1.1 pkgsrc/graphics/osg/patches/patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp
cvs diff -r1.9 -r1.10 pkgsrc/graphics/osg/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/osg/Makefile 2011/11/01 06:01:41 1.9
+++ pkgsrc/graphics/osg/Makefile 2011/12/11 11:59:06 1.10
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.9 2011/11/01 06:01:41 sbd Exp $ 1# $NetBSD: Makefile,v 1.10 2011/12/11 11:59:06 marino Exp $
2 2
3DISTNAME= OpenSceneGraph-${OSGVER} 3DISTNAME= OpenSceneGraph-${OSGVER}
4PKGNAME= osg-${OSGVER} 4PKGNAME= osg-${OSGVER}
5PKGREVISION= 6 5PKGREVISION= 7
6CATEGORIES= graphics devel 6CATEGORIES= graphics devel
7MASTER_SITES= http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-${OSGVER}/source/ 7MASTER_SITES= http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-${OSGVER}/source/
8EXTRACT_SUFX= .zip 8EXTRACT_SUFX= .zip
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.openscenegraph.org/ 11HOMEPAGE= http://www.openscenegraph.org/
12COMMENT= High performance 3D graphics toolkit 12COMMENT= High performance 3D graphics toolkit
13 13
14LICENSE= gnu-lgpl-v2.1 14LICENSE= gnu-lgpl-v2.1
15 15
16OSGVER= 2.8.3 16OSGVER= 2.8.3
17 17
18PKG_DESTDIR_SUPPORT= user-destdir 18PKG_DESTDIR_SUPPORT= user-destdir
@@ -26,19 +26,20 @@ PKGCONFIG_OVERRIDE+= packaging/pkgconfig @@ -26,19 +26,20 @@ PKGCONFIG_OVERRIDE+= packaging/pkgconfig
26CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release 26CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
27 27
28.include "../../graphics/cairo/buildlink3.mk" 28.include "../../graphics/cairo/buildlink3.mk"
29.include "../../graphics/freetype2/buildlink3.mk" 29.include "../../graphics/freetype2/buildlink3.mk"
30.include "../../graphics/glu/buildlink3.mk" 30.include "../../graphics/glu/buildlink3.mk"
31.include "../../graphics/jasper/buildlink3.mk" 31.include "../../graphics/jasper/buildlink3.mk"
32.include "../../mk/jpeg.buildlink3.mk" 32.include "../../mk/jpeg.buildlink3.mk"
33.include "../../mk/giflib.buildlink3.mk" 33.include "../../mk/giflib.buildlink3.mk"
34.include "../../graphics/librsvg/buildlink3.mk" 34.include "../../graphics/librsvg/buildlink3.mk"
35.include "../../graphics/MesaLib/buildlink3.mk" 35.include "../../graphics/MesaLib/buildlink3.mk"
36.include "../../graphics/openexr/buildlink3.mk" 36.include "../../graphics/openexr/buildlink3.mk"
37.include "../../graphics/png/buildlink3.mk" 37.include "../../graphics/png/buildlink3.mk"
38.include "../../graphics/tiff/buildlink3.mk" 38.include "../../graphics/tiff/buildlink3.mk"
 39.include "../../multimedia/ffmpeg/buildlink3.mk"
39.include "../../multimedia/xine-lib/buildlink3.mk" 40.include "../../multimedia/xine-lib/buildlink3.mk"
40.include "../../www/curl/buildlink3.mk" 41.include "../../www/curl/buildlink3.mk"
41.include "../../x11/libX11/buildlink3.mk" 42.include "../../x11/libX11/buildlink3.mk"
42.include "../../x11/libXrandr/buildlink3.mk" 43.include "../../x11/libXrandr/buildlink3.mk"
43.include "../../mk/pthread.buildlink3.mk" 44.include "../../mk/pthread.buildlink3.mk"
44.include "../../mk/bsd.pkg.mk" 45.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/graphics/osg/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/osg/PLIST 2010/08/26 13:08:49 1.1.1.1
+++ pkgsrc/graphics/osg/PLIST 2011/12/11 11:59:06 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2010/08/26 13:08:49 adam Exp $ 1@comment $NetBSD: PLIST,v 1.2 2011/12/11 11:59:06 marino Exp $
2bin/osgarchive 2bin/osgarchive
3bin/osgconv 3bin/osgconv
4bin/osgfilecache 4bin/osgfilecache
5bin/osgversion 5bin/osgversion
6bin/osgviewer 6bin/osgviewer
7include/OpenThreads/Atomic 7include/OpenThreads/Atomic
8include/OpenThreads/Barrier 8include/OpenThreads/Barrier
9include/OpenThreads/Block 9include/OpenThreads/Block
10include/OpenThreads/Condition 10include/OpenThreads/Condition
11include/OpenThreads/Config 11include/OpenThreads/Config
12include/OpenThreads/Exports 12include/OpenThreads/Exports
13include/OpenThreads/Mutex 13include/OpenThreads/Mutex
14include/OpenThreads/ReadWriteMutex 14include/OpenThreads/ReadWriteMutex
@@ -543,26 +543,27 @@ lib/libosgWidget.so.65 @@ -543,26 +543,27 @@ lib/libosgWidget.so.65
543lib/osgPlugins-${PKGVERSION}/osgdb_3dc.so 543lib/osgPlugins-${PKGVERSION}/osgdb_3dc.so
544lib/osgPlugins-${PKGVERSION}/osgdb_3ds.so 544lib/osgPlugins-${PKGVERSION}/osgdb_3ds.so
545lib/osgPlugins-${PKGVERSION}/osgdb_ac.so 545lib/osgPlugins-${PKGVERSION}/osgdb_ac.so
546lib/osgPlugins-${PKGVERSION}/osgdb_bmp.so 546lib/osgPlugins-${PKGVERSION}/osgdb_bmp.so
547lib/osgPlugins-${PKGVERSION}/osgdb_bsp.so 547lib/osgPlugins-${PKGVERSION}/osgdb_bsp.so
548lib/osgPlugins-${PKGVERSION}/osgdb_bvh.so 548lib/osgPlugins-${PKGVERSION}/osgdb_bvh.so
549lib/osgPlugins-${PKGVERSION}/osgdb_cfg.so 549lib/osgPlugins-${PKGVERSION}/osgdb_cfg.so
550lib/osgPlugins-${PKGVERSION}/osgdb_curl.so 550lib/osgPlugins-${PKGVERSION}/osgdb_curl.so
551lib/osgPlugins-${PKGVERSION}/osgdb_dds.so 551lib/osgPlugins-${PKGVERSION}/osgdb_dds.so
552lib/osgPlugins-${PKGVERSION}/osgdb_dot.so 552lib/osgPlugins-${PKGVERSION}/osgdb_dot.so
553lib/osgPlugins-${PKGVERSION}/osgdb_dw.so 553lib/osgPlugins-${PKGVERSION}/osgdb_dw.so
554lib/osgPlugins-${PKGVERSION}/osgdb_dxf.so 554lib/osgPlugins-${PKGVERSION}/osgdb_dxf.so
555lib/osgPlugins-${PKGVERSION}/osgdb_exr.so 555lib/osgPlugins-${PKGVERSION}/osgdb_exr.so
 556lib/osgPlugins-${PKGVERSION}/osgdb_ffmpeg.so
556lib/osgPlugins-${PKGVERSION}/osgdb_geo.so 557lib/osgPlugins-${PKGVERSION}/osgdb_geo.so
557lib/osgPlugins-${PKGVERSION}/osgdb_gif.so 558lib/osgPlugins-${PKGVERSION}/osgdb_gif.so
558lib/osgPlugins-${PKGVERSION}/osgdb_glsl.so 559lib/osgPlugins-${PKGVERSION}/osgdb_glsl.so
559lib/osgPlugins-${PKGVERSION}/osgdb_gz.so 560lib/osgPlugins-${PKGVERSION}/osgdb_gz.so
560lib/osgPlugins-${PKGVERSION}/osgdb_hdr.so 561lib/osgPlugins-${PKGVERSION}/osgdb_hdr.so
561lib/osgPlugins-${PKGVERSION}/osgdb_ive.so 562lib/osgPlugins-${PKGVERSION}/osgdb_ive.so
562lib/osgPlugins-${PKGVERSION}/osgdb_jp2.so 563lib/osgPlugins-${PKGVERSION}/osgdb_jp2.so
563lib/osgPlugins-${PKGVERSION}/osgdb_jpeg.so 564lib/osgPlugins-${PKGVERSION}/osgdb_jpeg.so
564lib/osgPlugins-${PKGVERSION}/osgdb_logo.so 565lib/osgPlugins-${PKGVERSION}/osgdb_logo.so
565lib/osgPlugins-${PKGVERSION}/osgdb_lwo.so 566lib/osgPlugins-${PKGVERSION}/osgdb_lwo.so
566lib/osgPlugins-${PKGVERSION}/osgdb_lws.so 567lib/osgPlugins-${PKGVERSION}/osgdb_lws.so
567lib/osgPlugins-${PKGVERSION}/osgdb_md2.so 568lib/osgPlugins-${PKGVERSION}/osgdb_md2.so
568lib/osgPlugins-${PKGVERSION}/osgdb_mdl.so 569lib/osgPlugins-${PKGVERSION}/osgdb_mdl.so
cvs diff -r1.2 -r1.3 pkgsrc/graphics/osg/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/osg/distinfo 2011/09/24 12:58:11 1.2
+++ pkgsrc/graphics/osg/distinfo 2011/12/11 11:59:06 1.3
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.2 2011/09/24 12:58:11 joerg Exp $ 1$NetBSD: distinfo,v 1.3 2011/12/11 11:59:06 marino Exp $
2 2
3SHA1 (OpenSceneGraph-2.8.3.zip) = 90502e4cbd47aac1689cc39d25ab62bbe0bba9fc 3SHA1 (OpenSceneGraph-2.8.3.zip) = 90502e4cbd47aac1689cc39d25ab62bbe0bba9fc
4RMD160 (OpenSceneGraph-2.8.3.zip) = 40a4988f4aefff7dbb6aab5225204ae41c945277 4RMD160 (OpenSceneGraph-2.8.3.zip) = 40a4988f4aefff7dbb6aab5225204ae41c945277
5Size (OpenSceneGraph-2.8.3.zip) = 6740017 bytes 5Size (OpenSceneGraph-2.8.3.zip) = 6740017 bytes
6SHA1 (patch-ab) = 3707347bed3d597bc50ad81f0e5c974ffb60100a 6SHA1 (patch-ab) = 28049bfe9e70301e5dba5c916ead51a31c86ac6c
7SHA1 (patch-ac) = bc35c9b0a9c7612137c66018b36b35b9897065be 7SHA1 (patch-ac) = bc35c9b0a9c7612137c66018b36b35b9897065be
8SHA1 (patch-ad) = 846f4f93104812125bffc8644948637de206bdc0 8SHA1 (patch-ad) = 846f4f93104812125bffc8644948637de206bdc0
9SHA1 (patch-ae) = d882f09acac61f74a25cf3efc8f3b7b3756adae3 9SHA1 (patch-ae) = d882f09acac61f74a25cf3efc8f3b7b3756adae3
10SHA1 (patch-src-osgPlugins-curl-ReaderWriterCURL.cpp) = 4ece011ff1284011b7777f00b838d6673c22bd2a 10SHA1 (patch-src-osgPlugins-curl-ReaderWriterCURL.cpp) = 4ece011ff1284011b7777f00b838d6673c22bd2a
 11SHA1 (patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp) = c828563699eb726214995bae63fcf028ff3a374a
cvs diff -r1.1.1.1 -r1.2 pkgsrc/graphics/osg/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/graphics/osg/patches/patch-ab 2010/08/26 13:08:49 1.1.1.1
+++ pkgsrc/graphics/osg/patches/patch-ab 2011/12/11 11:59:06 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ab,v 1.1.1.1 2010/08/26 13:08:49 adam Exp $ 1$NetBSD: patch-ab,v 1.2 2011/12/11 11:59:06 marino Exp $
2 2
3--- src/osgDB/FileUtils.cpp.orig 2009-01-12 17:28:37.000000000 +0200 3--- src/osgDB/FileUtils.cpp.orig 2009-01-12 17:28:37.000000000 +0200
4+++ src/osgDB/FileUtils.cpp 2009-01-12 17:30:14.000000000 +0200 4+++ src/osgDB/FileUtils.cpp 2009-01-12 17:30:14.000000000 +0200
5@@ -47,7 +47,7 @@ 5@@ -47,7 +47,7 @@
6 #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040) 6 #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040)
7 #define stat64 stat 7 #define stat64 stat
8 #endif 8 #endif
9-#elif defined(__CYGWIN__) || defined(__FreeBSD__) || (defined(__hpux) && !defined(_LARGEFILE64_SOURCE)) 9-#elif defined(__CYGWIN__) || defined(__FreeBSD__) || (defined(__hpux) && !defined(_LARGEFILE64_SOURCE))
10+#elif defined(__CYGWIN__) || defined(__FreeBSD__) || defined (__NetBSD__) || (defined(__hpux) && !defined(_LARGEFILE64_SOURCE)) 10+#elif defined(__CYGWIN__) || defined(__FreeBSD__) || defined (__NetBSD__) || (defined(__hpux) || defined(__DragonFly__) && !defined(_LARGEFILE64_SOURCE))
11 #define stat64 stat 11 #define stat64 stat
12 #endif 12 #endif
13  13
File Added: pkgsrc/graphics/osg/patches/Attic/patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp
$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>