Fix the way ffmpeg headers are included, bug 390793.

Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64

4 files changed, 35 insertions, 7 deletions

diff --git a/dev-games/openscenegraph/ChangeLog b/dev-games/openscenegraph/ChangeLog
index 1a6f8605eeb1..d903010d935e 100644
--- a/dev-games/openscenegraph/ChangeLog
+++ b/dev-games/openscenegraph/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/openscenegraph
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.43 2011/11/17 18:14:20 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.44 2011/11/17 18:57:24 reavertm Exp $
+
+  17 Nov 2011; Maciej Mrozowski <reavertm@gentoo.org>
+  +files/openscenegraph-3.0.1-libav-0.7.patch, openscenegraph-3.0.1.ebuild:
+  Fix the way ffmpeg headers are included, bug 390793.
 
   17 Nov 2011; Maciej Mrozowski <reavertm@gentoo.org> metadata.xml:
   Add myself as maintainer.
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index 93453ca34d8f..838393d385b8 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -5,16 +5,17 @@ AUX openscenegraph-2.8.3-cmake.patch 11939 RMD160 7685d55a3dc62aa373e98631b4589e
 AUX openscenegraph-2.8.3-curl.patch 345 RMD160 dd156aadfe3c6b368f4515475f800b8dd976ac7a SHA1 3e2082275c85a81dde66b0cf512a20b8b0fea82e SHA256 e3c8a3456620907af99dbd9861d930867d4adf254515435617695c327aff5ead
 AUX openscenegraph-2.8.3-ffmpeg.patch 367 RMD160 d631abecf98c20824b8ee7cb8f0992df92c73d7c SHA1 fe7e574af4fd3bccc9552c35abd8b6ece8e13e3f SHA256 9adb7f5f1fa1e22130f2aa08b66ff680667f7adc44de4ddddafeaf3c4549277d
 AUX openscenegraph-3.0.1-cmake.patch 10551 RMD160 944cb102712dc8e579530ed51e840fdbabf1f07f SHA1 253d324e479994d37b8a43dc5ee806e7ba099ce7 SHA256 d7c38edfd7987d3a50003090901a3f7732d47ec6724934fb159496c4eb727e19
+AUX openscenegraph-3.0.1-libav-0.7.patch 763 RMD160 e5058fe467b66dd56b20a857f6bcc75a077392ae SHA1 bbb03ff3f2a9745afaac70dd06342ff46272d87e SHA256 8e78e9e26aefa640bb020beaa92ebfd29d5cd6ef341568926eb4d34ba5688a75
 DIST OpenSceneGraph-2.8.3.zip 6740017 RMD160 40a4988f4aefff7dbb6aab5225204ae41c945277 SHA1 90502e4cbd47aac1689cc39d25ab62bbe0bba9fc SHA256 3a7b80ea02eeb39c37ded4d07e28ed4071a4a0ceba93f2834d39be7f7487115e
 DIST OpenSceneGraph-3.0.1.zip 6780282 RMD160 54b315c318b7ade2bcc65703cea5f41377e93a71 SHA1 13c7e39f6d62047ad944d8d28a0f0eb60384ce33 SHA256 0c1103574b0a5a27c7d68d43454f1bf9c0cea114a583c42637bc8eb47b1d8296
 EBUILD openscenegraph-2.8.3.ebuild 3909 RMD160 0e46a2005edf541551285fa60c27c9655d173127 SHA1 fd6c16f408b1ceb8543cfefbfc9090cca7e1334f SHA256 440ab1d413973bee30147586d1e8b6309cc7f249da34ec4fb53d8c8740d5f335
-EBUILD openscenegraph-3.0.1.ebuild 3861 RMD160 ddf19d8a9d726eb650a615101dae94c6ada4466f SHA1 e8ddd94ba93380b9e73eaf522c8d78a199c0e359 SHA256 a6b12b060f8352cd71eb30696ac95db38492d68bae86386b69f3895e1ea41747
-MISC ChangeLog 6489 RMD160 9afbb459f6e85825e569a40c9bdeb44918918079 SHA1 b2f115974e44ffef41348d635fa23e634f741f58 SHA256 0a1d21822f0f2fb75df8fa9fb3deac097f14dae75944e6ef069fa255f3f10f28
+EBUILD openscenegraph-3.0.1.ebuild 3906 RMD160 e0a2a0d50035448df6103dead0d26f853b1223a9 SHA1 dbbf0cb807445c5480dd6d07050ddcc94335adef SHA256 ec20660a38a2080a0aaa7feac7957c8d30a843463203eaef7d3682349748cfd0
+MISC ChangeLog 6675 RMD160 f871c75447c8a589bf633ee33d8c39d50ceecabe SHA1 60fb03d344779afc2c52201661e4ce67711154b3 SHA256 ea39cc4c454cd816cea3b5db316a15965152a9e3d7c441434293b6233c0d413d
 MISC metadata.xml 1272 RMD160 5a2c78de8616a0a8be6b253d0d4bc74c2e23937c SHA1 615d4392fda234a9f3fee934e54291e27f6668a9 SHA256 b481215aaefd210da29e865fee328cf6d4bd8eb75a0dcfa1876396fcb16a8a03
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7FTwAACgkQFuHa/bHpVdspdACffM+qMkbJZRQUeyK3/2zXYx4l
-vN0AoJ+xyMPIksFXnSfz1uymsGvD8An+
-=QQFD
+iEYEARECAAYFAk7FWRgACgkQFuHa/bHpVdtPgwCeKWfSQ27kKIOitp5l4ycBIXAG
+IEMAoLYk1tjyF8KhScG2Aditvw+sPlSO
+=9AHC
 -----END PGP SIGNATURE-----
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.0.1-libav-0.7.patch b/dev-games/openscenegraph/files/openscenegraph-3.0.1-libav-0.7.patch
new file mode 100644
index 000000000000..4748cd48c807
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.0.1-libav-0.7.patch
@@ -0,0 +1,22 @@
+diff -ruN OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp my/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp
+--- OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp	2011-06-17 10:41:56.000000000 +0200
++++ my/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp	2011-11-17 19:44:33.194607494 +0100
+@@ -9,12 +9,13 @@
+ #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>
++#include <libavutil/mathematics.h>
+ 
+-#ifdef USE_SWSCALE    
+-    #include <swscale.h>
++#ifdef USE_SWSCALE
++    #include <libswscale/swscale.h>
+ #endif
+ 
+ }
diff --git a/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild b/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
index 38c5d5698dfc..5b591903b193 100644
--- a/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild,v 1.1 2011/10/14 09:50:30 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild,v 1.2 2011/11/17 18:57:24 reavertm Exp $
 
 EAPI=3
 
@@ -84,6 +84,7 @@ DOCS=(AUTHORS.txt ChangeLog NEWS.txt)
 
 PATCHES=(
 	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${PN}-3.0.1-libav-0.7.patch"
 )
 
 src_configure() {