Fix build with latest ffmpeg / libav. Bug #439606.

upstream svn rev. 13335 contains similar changes.
no need to upstream this patch

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 299 insertions, 7 deletions

diff --git a/dev-games/openscenegraph/ChangeLog b/dev-games/openscenegraph/ChangeLog
index 97692f527858..f09a484eb647 100644
--- a/dev-games/openscenegraph/ChangeLog
+++ b/dev-games/openscenegraph/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-games/openscenegraph
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.52 2013/02/07 23:14:45 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.53 2013/02/09 00:14:04 aballier Exp $
+
+  08 Feb 2013; Alexis Ballier <aballier@gentoo.org>
+  openscenegraph-3.0.1-r1.ebuild, +files/openscenegraph-3.0.1-libav-9.patch:
+  Fix build with latest ffmpeg / libav. Bug #439606.
+  upstream svn rev. 13335 contains similar changes.
+  no need to upstream this patch
 
 *openscenegraph-3.0.1-r1 (07 Feb 2013)
 
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index 6d3a4cc1b51f..fe3f16054bc7 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -3,15 +3,16 @@ Hash: SHA256
 
 AUX openscenegraph-3.0.1-cmake.patch 10551 SHA256 d7c38edfd7987d3a50003090901a3f7732d47ec6724934fb159496c4eb727e19 SHA512 15457f5ecdc1fc626a36f6daf1b15ba26d6e94047b12b6cdde5b8b39ae6f38e96263dd4268aeda63036bbcbb32205b5ec04e742adaa016d5ae3bb9455b36c144 WHIRLPOOL 724d2f4051f60464077bdccba3d7a25dbbc742bf350077c8071989ca05c4dd08688955cb2356ec8fe4722ccc6867dd22281485e465b62a4820e11a2c5c5d2b67
 AUX openscenegraph-3.0.1-libav-0.7.patch 763 SHA256 8e78e9e26aefa640bb020beaa92ebfd29d5cd6ef341568926eb4d34ba5688a75 SHA512 20db7d3b1f9358f5701a9414724f9d8556d6a20bc7b0ed3c904421f71c084cd5eef933695008c25e2ab8f161b6610acdd033425538faab718b36768df2d5f3c8 WHIRLPOOL cdb0e50b0bc410461c153df0856d564f80d1767105baf0c5cc4dbca1232593f7c6bfd3a2f4d74b28508165d8224ec0b378f73144104ac3b0d7d67111261c7438
+AUX openscenegraph-3.0.1-libav-9.patch 11919 SHA256 2efd2bab9d2469c42ec2bf78b2c28f5e71c79d5718b54c817391c777a2e27465 SHA512 71f3411b643bc96f67ff60adc36890392355eb2c78f27eac105a526cb97fdf268069f3f453371a6a4204fdf44a3ccc19d250cc18238d99e65c7bd055b6ec3af5 WHIRLPOOL 21cd313b0c2fc4cf6b0b9fac7aef10a682bed9d12fedabaa84be5d076cac21306db50c13a065963da312bdfd2c567755717bae333ce1968d4c79970b6b3224e8
 AUX openscenegraph-3.0.1-xinelib12x.patch 706 SHA256 1d9baf7ec7cfaac0cdb4a08742e663f12a4fe5a431d8fe25b34a2cb4a0cbd828 SHA512 6c72f814a38628b222c82ccf71c3fa7f66af2b92ce45cbcb8c5a5c368239f9dfd60dbd04a8c9c65bad62e3c3005521531a19f469af9919a75b707b8206408c7b WHIRLPOOL 027427daff13ba6f9efa30ca657130936173b6604b2ddc3f848c544d505a22c99d686bd1f27b3497fc60175517ad80227f6103921308d53da7aaa7d27ae038b3
 DIST OpenSceneGraph-3.0.1.zip 6780282 SHA256 0c1103574b0a5a27c7d68d43454f1bf9c0cea114a583c42637bc8eb47b1d8296 SHA512 5fbfe9070721f055349a27516c9a20195070d13ab562e0c5109cc1f1d46dfaf09778152a14f5815b72728d315cb80b2d7bab747bfd9be58aea22d600c2c97912 WHIRLPOOL e3e24e2b36fd59a823d43864e7123d3683a8b2ef4e09cae17895d4b15eb4321bdd112cd59a734e1e55924cc9af52198c6152797bd73ab33a91bf17936232a7b0
-EBUILD openscenegraph-3.0.1-r1.ebuild 3708 SHA256 ac09397a6a7d8f177d44824f8ed27df08ff051240294542d9d5e8ddb01036ae3 SHA512 2dd81b51490552742681776902b136e135e829dc2b4ef00db6c6472fe3e1e6362fc884eba58a94f2c1bcdc895cc28275ba81a2db4472309e4ffed2da60e1c49d WHIRLPOOL eb04a4893a347705b6b5df103ef64ded7f150aa0262a61e33a5634a58d312fae4cba0fb73490c7f7b11f88ff2f078157d8435b9a9e9f31c54fe5e977a3667d93
-MISC ChangeLog 8007 SHA256 0585f23c88a48dc8f47f42428aa37fa3c76bbd2956dd4ad30cd47f90bb7f04f8 SHA512 a09b7eb979110955c02a2b7280f59e670250bcca6fab0d0bf6edec08d8e2d8ae61e4476cca338f82e2c22ed3a3c6a2f24a321dce900f3c117499624f31c18a12 WHIRLPOOL 8dbb4940bc16db4f726467814ae946546060e43d31384b8740d9968fb7c4ee1ab1c4366fc64f7e893b6a875c112330eaf104234b37dec613aa469cf674484314
+EBUILD openscenegraph-3.0.1-r1.ebuild 3749 SHA256 c3bdbdfa342194dd5dfe9993368abeafe9b4275e3c932fd1a38223d5da90933f SHA512 854ada5f784ad4e7218182f2bd729caf1cdff721f8e3b351ee1440595ee1081b15fcd077e45c289dd9b50f6022fb7176367fef2d40ce24c01c92d29bd2dfb441 WHIRLPOOL e848d92779bf83e16b09d41c9e2006cab54a77b0bbc4d0a300036ac524e45e1d22c9fbe25fde093276a661da43c47315e47a92b6461e75d4c7667707be6f7596
+MISC ChangeLog 8275 SHA256 a56620c1d3e4c7c038e48b6ee053d8a7f5cc97c0347fe9103fbbf761b768bea0 SHA512 5264c30d8f97d2402c7759e5ebfd5687dfdd380e9aa7574af30f04980657c5aa87fd0f711ad44789f0a3c514d4ac0b3dc1321b5739af24cfbe5a47f95ae3e0b8 WHIRLPOOL f1f9097fd94b82a84a929ec0d8983b873f15eebe6be552fe2f86fc044f4f30acc4a07b9fe7fe73186f9e72137bb0b65255ff8f35fd20a5b4522786e34eeed0fd
 MISC metadata.xml 1272 SHA256 b481215aaefd210da29e865fee328cf6d4bd8eb75a0dcfa1876396fcb16a8a03 SHA512 1edacc984e0376661e31eeb3c7c1735ca8910a82bf28d30b4ae282855dc86a4a3bdcfc4593dbeeb4563fccbf3ae1b4a45125769e911d1cfd0926dcc72dde5716 WHIRLPOOL bb17deea650cc6dce697129d1da7e59b522936f607891c88f2b141045acbce98c3670ebbd3850290e85ae7c0957b5a1d8a710468d8f3b4e048b94c5447663131
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEUNWUACgkQFuHa/bHpVdsnugCfQ3GzCMZ8dHWJe0wwuldruI3g
-KN4AnRZSuuV4PZpY8uWuyJycsYhUbJJT
-=hzEf
+iEYEAREIAAYFAlEVlM0ACgkQvFcC4BYPU0oiBACfQomusmQHFYE6OCeN7b0FObhN
+/6YAoKT7mhX/khjaiARCoVHn4BTHtGqg
+=M53F
 -----END PGP SIGNATURE-----
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.0.1-libav-9.patch b/dev-games/openscenegraph/files/openscenegraph-3.0.1-libav-9.patch
new file mode 100644
index 000000000000..018570f02dd5
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.0.1-libav-9.patch
@@ -0,0 +1,284 @@
+Patch by lu_zero
+https://bugs.gentoo.org/show_bug.cgi?id=439606
+upstream svn rev. 13335 contains similar changes.
+no need to upstream this patch.
+
+diff -burN OpenSceneGraph-3.0.1.old//CMakeModules/FindFFmpeg.cmake OpenSceneGraph-3.0.1/CMakeModules/FindFFmpeg.cmake
+--- OpenSceneGraph-3.0.1.old//CMakeModules/FindFFmpeg.cmake	2011-04-19 13:40:22.000000000 +0200
++++ OpenSceneGraph-3.0.1/CMakeModules/FindFFmpeg.cmake	2012-11-22 13:59:28.303401170 +0100
+@@ -131,20 +131,16 @@
+     SET(FFMPEG_FOUND "YES")
+ 
+     SET(FFMPEG_INCLUDE_DIRS
+-        ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS} ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}/libavformat
+-        ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS} ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS}/libavdevice
+-        ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}/libavcodec
+-        ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS} ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}/libavutil
++        ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}
++        ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS}
++        ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}
++        ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}
+     )
+ 
+     IF (FFMPEG_STDINT_INCLUDE_DIR)
+         SET(FFMPEG_INCLUDE_DIRS
+             ${FFMPEG_INCLUDE_DIRS}
+             ${FFMPEG_STDINT_INCLUDE_DIR}
+-            ${FFMPEG_STDINT_INCLUDE_DIR}/libavformat
+-            ${FFMPEG_STDINT_INCLUDE_DIR}/libavdevice
+-            ${FFMPEG_STDINT_INCLUDE_DIR}/libavcodec
+-            ${FFMPEG_STDINT_INCLUDE_DIR}/libavutil
+         )
+     ENDIF()
+ 
+diff -burN OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp
+--- OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp	2011-04-19 13:40:22.000000000 +0200
++++ OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp	2012-11-22 15:03:53.668601596 +0100
+@@ -89,7 +89,7 @@
+         //    m_context->flags |= CODEC_FLAG_TRUNCATED;
+ 
+         // Open codec
+-        if (avcodec_open(m_context, p_codec) < 0)
++        if (avcodec_open2(m_context, p_codec, NULL) < 0)
+             throw std::runtime_error("avcodec_open() failed");
+     }
+ 
+Binary files OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/.FFmpegDecoderAudio.cpp.swp and OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/.FFmpegDecoderAudio.cpp.swp differ
+diff -burN OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoder.cpp OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp
+--- OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoder.cpp	2011-07-15 12:25:12.000000000 +0200
++++ OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp	2012-11-22 15:59:39.569775078 +0100
+@@ -64,21 +64,12 @@
+         
+             OSG_NOTICE<<"Attempting to stream "<<filename<<std::endl;
+ 
+-            AVFormatParameters formatParams;
+-            memset(&formatParams, 0, sizeof(AVFormatParameters));
+             AVInputFormat *iformat;
++            AVDictionary *options = NULL;
+ 
+-            formatParams.channel = 0;
+-            formatParams.standard = 0;
+-#if 1
+-            formatParams.width = 320;
+-            formatParams.height = 240;
+-#else
+-            formatParams.width = 640;
+-            formatParams.height = 480;
+-#endif            
+-            formatParams.time_base.num = 1;
+-            formatParams.time_base.den = 30;
++            av_dict_set(&options, "video_size", "320x240", 0);
++
++            av_dict_set(&options, "framerate", "1/30", 0);
+ 
+             std::string format = "video4linux2";
+             iformat = av_find_input_format(format.c_str());
+@@ -92,7 +83,7 @@
+                 OSG_NOTICE<<"Failed to find input format: "<<format<<std::endl;
+             }
+ 
+-            int error = av_open_input_file(&p_format_context, filename.c_str(), iformat, 0, &formatParams);
++            int error = avformat_open_input(&p_format_context, filename.c_str(), iformat, &options);
+             if (error != 0)
+             {
+                 std::string error_str;
+@@ -110,21 +101,21 @@
+                     default: error_str = "Unknown error"; break;
+                 }
+ 
+-                throw std::runtime_error("av_open_input_file() failed : " + error_str);
++                throw std::runtime_error("avformat_open_input() failed : " + error_str);
+             }
+         }
+         else
+         {
+             AVInputFormat* av_format = (parameters ? parameters->getFormat() : 0);
+-            AVFormatParameters* av_params = (parameters ? parameters->getFormatParameter() : 0);
+-            if (av_open_input_file(&p_format_context, filename.c_str(), av_format, 0, av_params) !=0 )
++            AVDictionary* av_options = (parameters ? parameters->getOptions() : NULL);
++            if (avformat_open_input(&p_format_context, filename.c_str(), av_format, &av_options) !=0 )
+                 throw std::runtime_error("av_open_input_file() failed");
+         }
+         
+         m_format_context.reset(p_format_context);
+ 
+         // Retrieve stream info
+-        if (av_find_stream_info(p_format_context) < 0)
++        if (avformat_find_stream_info(p_format_context, NULL) < 0)
+             throw std::runtime_error("av_find_stream_info() failed");
+ 
+         m_duration = double(m_format_context->duration) / AV_TIME_BASE;
+@@ -134,7 +125,7 @@
+         m_clocks.reset(m_start);
+ 
+         // Dump info to stderr
+-        dump_format(p_format_context, 0, filename.c_str(), false);
++        av_dump_format(p_format_context, 0, filename.c_str(), false);
+ 
+         // Find and open the first video and audio streams (note that audio stream is optional and only opened if possible)
+ 
+@@ -292,7 +283,7 @@
+         // Read the next frame packet
+         if (av_read_frame(m_format_context.get(), &packet) < 0)
+         {
+-            if (url_ferror(m_format_context->pb) == 0)
++            if (m_format_context->pb->eof_reached == 0)
+                 end_of_stream = true;
+             else
+                 throw std::runtime_error("av_read_frame() failed");
+Binary files OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/.FFmpegDecoder.cpp.swp and OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/.FFmpegDecoder.cpp.swp differ
+diff -burN OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoder.hpp OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoder.hpp
+--- OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoder.hpp	2011-04-19 13:40:22.000000000 +0200
++++ OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoder.hpp	2012-11-22 15:59:18.895774005 +0100
+@@ -46,8 +46,8 @@
+         {
+             if (_ptr) 
+             {
+-                OSG_NOTICE<<"Calling av_close_input_file("<<_ptr<<")"<<std::endl;
+-                av_close_input_file(_ptr);
++                OSG_NOTICE<<"Calling avformat_close_input("<<_ptr<<")"<<std::endl;
++                avformat_close_input(&_ptr);
+             }
+             _ptr = 0;
+         }
+@@ -151,8 +151,7 @@
+ 
+ inline double FFmpegDecoder::creation_time() const
+ {
+-   if(m_format_context) return m_format_context->timestamp;
+-   else return HUGE_VAL;
++    return HUGE_VAL;
+ }
+ 
+ inline double FFmpegDecoder::duration() const
+diff -burN OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
+--- OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp	2011-04-19 13:40:22.000000000 +0200
++++ OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp	2012-11-22 16:01:30.906780849 +0100
+@@ -83,7 +83,7 @@
+     m_context = stream->codec;
+ 
+     // Trust the video size given at this point
+-    // (avcodec_open seems to sometimes return a 0x0 size)
++    // (avcodec_open2 seems to sometimes return a 0x0 size)
+     m_width = m_context->width;
+     m_height = m_context->height;
+     findAspectRatio();
+@@ -105,8 +105,8 @@
+     //    m_context->flags |= CODEC_FLAG_TRUNCATED;
+ 
+     // Open codec
+-    if (avcodec_open(m_context, m_codec) < 0)
+-        throw std::runtime_error("avcodec_open() failed");
++    if (avcodec_open2(m_context, m_codec, NULL) < 0)
++        throw std::runtime_error("avcodec_open2() failed");
+ 
+     // Allocate video frame
+     m_frame.reset(avcodec_alloc_frame());
+Binary files OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/.FFmpegDecoderVideo.cpp.swp and OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/.FFmpegDecoderVideo.cpp.swp differ
+diff -burN OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegParameters.cpp OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegParameters.cpp
+--- OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegParameters.cpp	2011-07-15 12:25:12.000000000 +0200
++++ OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegParameters.cpp	2012-11-22 17:20:09.019025477 +0100
+@@ -8,7 +8,7 @@
+ #if LIBAVCODEC_VERSION_MAJOR >= 53
+ extern "C"
+ {
+-    #include <parseutils.h>
++    #include <libavutil/parseutils.h>
+ }
+ #define av_parse_video_frame_size av_parse_video_size
+ #define av_parse_video_frame_rate av_parse_video_rate
+@@ -19,7 +19,7 @@
+ 
+     extern "C"
+     {
+-        #include <pixdesc.h>
++        #include <libavutil/pixdesc.h>
+     }
+     
+     inline PixelFormat osg_av_get_pix_fmt(const char *name) { return av_get_pix_fmt(name); }
+@@ -34,14 +34,15 @@
+ 
+ 
+ FFmpegParameters::FFmpegParameters() :
+-    m_format(0)
+-{
+-    memset(&m_parameters, 0, sizeof(m_parameters));
+-}
++    m_format(0),
++    m_options(NULL)
++{}
+ 
+ 
+ FFmpegParameters::~FFmpegParameters()
+-{}
++{
++    av_dict_free(&m_options);
++}
+ 
+ 
+ void FFmpegParameters::parse(const std::string& name, const std::string& value)
+@@ -59,40 +60,19 @@
+     }
+     else if (name == "pixel_format")
+     {
+-        m_parameters.pix_fmt = osg_av_get_pix_fmt(value.c_str());
++        av_dict_set(&m_options, "pixel_format", value.c_str(), 0);
+     }
+     else if (name == "frame_size")
+     {
+-        int frame_width = 0, frame_height = 0;
+-        if (av_parse_video_frame_size(&frame_width, &frame_height, value.c_str()) < 0)
+-        {
+-            OSG_NOTICE<<"Failed to apply frame size: "<<value.c_str()<<std::endl;
+-            return;
+-        }
+-        if ((frame_width % 2) != 0 || (frame_height % 2) != 0)
+-        {
+-            OSG_NOTICE<<"Frame size must be a multiple of 2: "<<frame_width<<"x"<<frame_height<<std::endl;
+-            return;
+-        }
+-        m_parameters.width = frame_width;
+-        m_parameters.height = frame_height;
++        av_dict_set(&m_options, "video_size", value.c_str(), 0);
+     }
+     else if (name == "frame_rate")
+     {
+-        AVRational frame_rate;
+-        if (av_parse_video_frame_rate(&frame_rate, value.c_str()) < 0)
+-        {
+-            OSG_NOTICE<<"Failed to apply frame rate: "<<value.c_str()<<std::endl;
+-            return;
+-        }
+-        m_parameters.time_base.den = frame_rate.num;
+-        m_parameters.time_base.num = frame_rate.den;
++        av_dict_set(&m_options, "framerate", value.c_str(), 0);
+     }
+     else if (name == "audio_sample_rate")
+     {
+-        int audio_sample_rate = 44100;
+-        std::stringstream ss(value); ss >> audio_sample_rate;
+-        m_parameters.sample_rate = audio_sample_rate;
++        av_dict_set(&m_options, "sample_rate", value.c_str(), 0);
+     }
+ }
+ 
+diff -burN OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegParameters.hpp OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegParameters.hpp
+--- OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegParameters.hpp	2011-04-19 13:40:22.000000000 +0200
++++ OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegParameters.hpp	2012-11-22 15:23:27.490662455 +0100
+@@ -21,14 +21,14 @@
+     bool isFormatAvailable() const { return m_format!=NULL; }
+     
+     AVInputFormat* getFormat() { return m_format; }
+-    AVFormatParameters* getFormatParameter() { return &m_parameters; }
++    AVDictionary* getOptions() { return m_options; }
+     
+     void parse(const std::string& name, const std::string& value);
+ 
+ protected:
+ 
+     AVInputFormat* m_format;
+-    AVFormatParameters m_parameters;
++    AVDictionary* m_options;
+ };
+ 
+ 
diff --git a/dev-games/openscenegraph/openscenegraph-3.0.1-r1.ebuild b/dev-games/openscenegraph/openscenegraph-3.0.1-r1.ebuild
index c1a499fa7355..76fcdcc04066 100644
--- a/dev-games/openscenegraph/openscenegraph-3.0.1-r1.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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-r1.ebuild,v 1.1 2013/02/07 23:14:45 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-3.0.1-r1.ebuild,v 1.2 2013/02/09 00:14:04 aballier Exp $
 
 EAPI=3
 
@@ -85,6 +85,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.1-cmake.patch
 	"${FILESDIR}"/${PN}-3.0.1-libav-0.7.patch
 	"${FILESDIR}"/${PN}-3.0.1-xinelib12x.patch
+	"${FILESDIR}"/${PN}-3.0.1-libav-9.patch
 )
 
 src_configure() {