Gentoo Archives: gentoo-commits

From: "Maciej Mrozowski (reavertm)" <reavertm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-games/openscenegraph/files: openscenegraph-3.0.1-libav-0.7.patch
Date: Thu, 17 Nov 2011 18:57:33
Message-Id: 20111117185724.2766A2004B@flycatcher.gentoo.org
1 reavertm 11/11/17 18:57:24
2
3 Added: openscenegraph-3.0.1-libav-0.7.patch
4 Log:
5 Fix the way ffmpeg headers are included, bug 390793.
6
7 (Portage version: 2.2.0_alpha74/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 dev-games/openscenegraph/files/openscenegraph-3.0.1-libav-0.7.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-3.0.1-libav-0.7.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/openscenegraph/files/openscenegraph-3.0.1-libav-0.7.patch?rev=1.1&content-type=text/plain
14
15 Index: openscenegraph-3.0.1-libav-0.7.patch
16 ===================================================================
17 diff -ruN OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp my/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp
18 --- OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp 2011-06-17 10:41:56.000000000 +0200
19 +++ my/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp 2011-11-17 19:44:33.194607494 +0100
20 @@ -9,12 +9,13 @@
21 #define FF_API_OLD_SAMPLE_FMT 0
22 #include <errno.h> // for error codes defined in avformat.h
23 #include <stdint.h>
24 -#include <avcodec.h>
25 -#include <avformat.h>
26 -#include <avdevice.h>
27 +#include <libavcodec/avcodec.h>
28 +#include <libavformat/avformat.h>
29 +#include <libavdevice/avdevice.h>
30 +#include <libavutil/mathematics.h>
31
32 -#ifdef USE_SWSCALE
33 - #include <swscale.h>
34 +#ifdef USE_SWSCALE
35 + #include <libswscale/swscale.h>
36 #endif
37
38 }